[MAINT]: Revert #286

[synchon]

This is to record and remind us that #286 uses a "hack" to get to the solution of the problem addressed. As mentioned in #286, after the inclusion of support for multi-MNI template spaces, the "hack" should be reverted to reach to a more idiomatic solution.