Revert f2acdae..755c61c

This rolls back to commit f2acdae26b30aa8ac4ae482297e4a112e1b0a43b.