Revert 497754c..ac5ca2b

This rolls back to commit 497754c2f7f9c500b5ef9446ba5fa153a1dbf7f9.