Revert f44bd1c..49408a2

This rolls back to commit f44bd1c3aa303781f635a974d970284cf5261e55.