Revert 5ccd34e..fa732b3

This rolls back to commit 5ccd34e1e20e22488d62da6e1218609f39233147.