Revert f5f4e40..7ccf50e

This rolls back to commit f5f4e4016ba659f4b3c73d8e1291f394f8c36547.