Revert 2f18620..1bca8f4

This rolls back to commit 2f186203d1dec89706af9a2511a3077cfbafc3c4.