Revert 49a0a7a..e493f99

This rolls back to commit 49a0a7a88b6645b674101557ad63180309b7a03f.