Revert a4ebc52..28e005a

This rolls back to commit a4ebc526202b9c00c1192b0a6d9e52f3282e7301.