Revert ccc63c1..332928b

This rolls back to commit ccc63c1c2133fca2b32848f0651b5e7222ac5fce.