Revert 28338bb..0f2a63d

This rolls back to commit 28338bbc9a616cf76125bae6fafe0610382553f4.