Revert f2ad9da..434f57d

This rolls back to commit f2ad9da345e8db6a8ee27a1e60cd2db298673ca6.