Revert a2a0538..53819e9

This rolls back to commit a2a053860cb6228b7d29e240eab5a49a5cb6d5df.