Revert 96fe2ab..3471e74

This rolls back to commit 96fe2abede87f4cb6f3a94ed22d39e439191751f.
change locations