Revert 5a29310..e547c53

This rolls back to commit 5a2931021b3ef53d8556ee39aa715eb4c7d774e0.